Speed up stepping backwards. (#320638, Larry Ewing, Paolo Borelli)

2005-12-12  Matthias Clasen  <mclasen@redhat.com>

	* gtk/gtktextbtree.c (_gtk_text_line_char_to_byte_offsets):
	* gtk/gtktextiter.c (gtk_text_iter_backward_chars): Speed up
	stepping backwards.  (#320638, Larry Ewing, Paolo Borelli)

diff --git a/ChangeLog b/ChangeLog
index e2c3e5bb69837a0b71f009b184396ff11d409b3f..dafd4a9acf993353b070f88312f19a27a22dcb92 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
 2005-12-12  Matthias Clasen  <mclasen@redhat.com>
 
+       * gtk/gtktextbtree.c (_gtk_text_line_char_to_byte_offsets): 
+       * gtk/gtktextiter.c (gtk_text_iter_backward_chars): Speed up
+       stepping backwards.  (#320638, Larry Ewing, Paolo Borelli)
+       
        * gtk/gtkicontheme.c (ensure_valid_themes): Only broadcast
        _GTK_LOAD_ICONTHEMES if we detect a real theme change, not
        upon initial theme load.  (#323876, Peter Lund)

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index e2c3e5bb69837a0b71f009b184396ff11d409b3f..dafd4a9acf993353b070f88312f19a27a22dcb92 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,5 +1,9 @@
 2005-12-12  Matthias Clasen  <mclasen@redhat.com>
 
+       * gtk/gtktextbtree.c (_gtk_text_line_char_to_byte_offsets): 
+       * gtk/gtktextiter.c (gtk_text_iter_backward_chars): Speed up
+       stepping backwards.  (#320638, Larry Ewing, Paolo Borelli)
+       
        * gtk/gtkicontheme.c (ensure_valid_themes): Only broadcast
        _GTK_LOAD_ICONTHEMES if we detect a real theme change, not
        upon initial theme load.  (#323876, Peter Lund)

diff --git a/gtk/gtktextbtree.c b/gtk/gtktextbtree.c
index c323c713fa4b1896ff2c6244fe98ca7c2c618336..f9b25b3f789015a94457f740ed69ef1c4840cf87 100644 (file)
--- a/gtk/gtktextbtree.c
+++ b/gtk/gtktextbtree.c
@@ -4146,7 +4146,12 @@ _gtk_text_line_char_to_byte_offsets (GtkTextLine *line,
     {
       const char *p;
 
-      p = g_utf8_offset_to_pointer (seg->body.chars, offset);
+      /* if in the last fourth of the segment walk backwards */
+      if (seg->char_count - offset < seg->char_count / 4)
+        p = g_utf8_offset_to_pointer (seg->body.chars + seg->byte_count, 
+                                      offset - seg->char_count);
+      else
+        p = g_utf8_offset_to_pointer (seg->body.chars, offset);
 
       *seg_byte_offset = p - seg->body.chars;
 

diff --git a/gtk/gtktextiter.c b/gtk/gtktextiter.c
index fd5b4f4c8f08e834ec54f2c06a620b703f544ce4..a2c099bfcf4d1d44b62ce97e8c87537310b08cf6 100644 (file)
--- a/gtk/gtktextiter.c
+++ b/gtk/gtktextiter.c
@@ -2386,23 +2386,25 @@ gtk_text_iter_backward_chars (GtkTextIter *iter, gint count)
       g_assert (real->segment->char_count > 0);
       g_assert (real->segment->type == &gtk_text_char_type);
 
-      real->segment_char_offset -= count;
-      g_assert (real->segment_char_offset >= 0);
-
       if (real->line_byte_offset >= 0)
         {
           const char *p;
           gint new_byte_offset;
-          gint i;
 
-          p = g_utf8_offset_to_pointer (real->segment->body.chars,
-                                        real->segment_char_offset);
+          /* if in the last fourth of the segment walk backwards */
+          if (count < real->segment_char_offset / 4)
+            p = g_utf8_offset_to_pointer (real->segment->body.chars + real->segment_byte_offset, 
+                                          -count);
+          else
+            p = g_utf8_offset_to_pointer (real->segment->body.chars,
+                                          real->segment_char_offset - count);
 
           new_byte_offset = p - real->segment->body.chars;
           real->line_byte_offset -= (real->segment_byte_offset - new_byte_offset);
           real->segment_byte_offset = new_byte_offset;
         }
 
+      real->segment_char_offset -= count;
       real->line_char_offset -= count;
 
       adjust_char_index (real, 0 - count);